Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Apr 2010 22:01:58 +0000 (22:01 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 5 Apr 2010 22:01:58 +0000 (22:01 +0000)

Trivial merge